From: Florian Müllner <fmuellner@gnome.org>
Date: Sat, 18 May 2013 18:53:49 +0000 (+0200)
Subject: workspacesView: Adapt to changes in windowManager
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~4141
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=e0a6a623d2ca349d8f8f373b79a452586c219124;p=gnome-shell.git

workspacesView: Adapt to changes in windowManager

The actionMoveWorkspace() function was changed in commit 8727661c1,
adapt its use in workspacesView as well.

https://bugzilla.gnome.org/show_bug.cgi?id=659288
---

diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js
index 25140a8f1..50f079c3e 100644
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -760,15 +760,20 @@ const WorkspacesDisplay = new Lang.Class({
     _onScrollEvent: function(actor, event) {
         if (!this.actor.mapped)
             return false;
+        let activeWs = global.screen.get_active_workspace();
+        let ws;
         switch (event.get_scroll_direction()) {
         case Clutter.ScrollDirection.UP:
-            Main.wm.actionMoveWorkspace(Meta.MotionDirection.UP);
-            return true;
+            ws = activeWs.get_neighbor(Meta.MotionDirection.UP);
+            break;
         case Clutter.ScrollDirection.DOWN:
-            Main.wm.actionMoveWorkspace(Meta.MotionDirection.DOWN);
-            return true;
+            ws = activeWs.get_neighbor(Meta.MotionDirection.DOWN);
+            break;
+        default:
+            return false;
         }
-        return false;
+        Main.wm.actionMoveWorkspace(ws);
+        return true;
     }
 });
 Signals.addSignalMethods(WorkspacesDisplay.prototype);